Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Tue, 19 Jan 2010 10:52:59 +0000 (11:52 +0100)
committerJan D. <jan.h.d@swipnet.se>
Tue, 19 Jan 2010 10:52:59 +0000 (11:52 +0100)

Trivial merge